Sākums Izpētīt Palīdzība
Reģistrēties Pierakstīties
J1X
/
huginn
Vērot 2
Pievienot zvaigznīti 0
Atdalīts 0

Pārlūkot izejas kodu
Fix menu/actions drop down regressions from previous patch (+ add bootstrap style colour classes to css)

Glenn 'devalias' Grant 10 gadi atpakaļ
vecāks
26efcab289
revīzija
cf03cbbe67
2 mainītis faili ar 34 papildinājumiem un 10 dzēšanām
Rādīt salīdzināšanas statistiku
  1. 13 0
      app/assets/stylesheets/application.css.scss.erb
  2. 21 10
      app/views/agents/show.html.erb

+ 13 - 0
app/assets/stylesheets/application.css.scss.erb
Parādīt failu 

@@ -147,3 +147,16 @@ tr.agent-disabled {
147 147 
 .json-editor blockquote {
148 148 
   font-size: 14px;
149 149 
 }
150 
+
151 
+// Bootstrappy colour styles
152 
+.color-danger {
153 
+  color: #d9534f;
154 
+}
155 
+
156 
+.color-warning {
157 
+  color: #f0ad4e;
158 
+}
159 
+
160 
+.color-success {
161 
+  color: #5cb85c;
162 
+}

+ 21 - 10
app/views/agents/show.html.erb
Parādīt failu 

@@ -2,6 +2,8 @@
2 2 
   <div class='row'>
3 3 
     <div class='col-md-2'>
4 4 
         <ul class="nav nav-pills nav-stacked" id="show-tabs">
5 
+          <li><%= link_to '<span class="glyphicon glyphicon-chevron-left"></span> Back'.html_safe, agents_path %></li>
6 
+
5 7 
           <% if agent_show_view(@agent).present? %>
6 8 
             <li class='active'><a href="#summary" data-toggle="tab"><span class='glyphicon glyphicon-picture'></span> Summary</a></li>
7 9 
             <li><a href="#details" data-toggle="tab"><span class='glyphicon glyphicon-indent-left'></span> Details</a></li>
 
@@ -9,31 +11,32 @@
9 11 
             <li class='disabled'><a><span class='glyphicon glyphicon-picture'></span> Summary</a></li>
10 12 
             <li class='active'><a href="#details" data-toggle="tab"><span class='glyphicon glyphicon-indent-left'></span> Details</a></li>
11 13 
           <% end %>
14 
+
12 15 
           <li><a href="#logs" data-toggle="tab" data-agent-id="<%= @agent.id %>" class='<%= @agent.recent_error_logs? ? 'recent-errors' : '' %>'><span class='glyphicon glyphicon-list-alt'></span> Logs</a></li>
13 16
14 17 
           <% if @agent.can_create_events? && @agent.events.count > 0 %>
15 18 
             <li><%= link_to '<span class="glyphicon glyphicon-random"></span> Events'.html_safe, events_path(:agent => @agent.to_param) %></li>
19 
+          <% else %>
20 
+            <li class='disabled'><a><span class='glyphicon glyphicon-random'></span> Events</a></li>
16 21 
           <% end %>
17 
-          <li><%= link_to '<span class="glyphicon glyphicon-chevron-left"></span> Back'.html_safe, agents_path %></li>
18 
-          <li><%= link_to '<span class="glyphicon glyphicon-pencil"></span> Edit'.html_safe, edit_agent_path(@agent) %></li>
19 22
20 23 
           <li class="dropdown">
21 24 
             <a class="dropdown-toggle" data-toggle="dropdown" href="#">Actions <b class="caret"></b></a>
22 25 
             <ul class="dropdown-menu" role="menu" aria-labelledby="dLabel">
23 26 
               <% if @agent.can_be_scheduled? %>
24 27 
                 <li>
25 
-                  <%= link_to '<span class="glyphicon glyphicon-refresh"></span> Run'.html_safe, run_agent_path(@agent, :return => "show"), method: :post, :tabindex => "-1" %>
28 
+                  <%= link_to '<span class="color-success glyphicon glyphicon-refresh"></span> Run'.html_safe, run_agent_path(@agent, :return => "show"), method: :post, :tabindex => "-1" %>
26 29 
                 </li>
27 30 
               <% end %>
28 31
29 
-              <% if @agent.can_create_events? && @agent.events.count > 0 %>
30 
-                <li>
31 
-                  <%= link_to '<span class="glyphicon glyphicon-trash"></span> Delete all events'.html_safe, remove_events_agent_path(@agent), method: :delete, data: {confirm: 'Are you sure you want to delete ALL events for this Agent?'}, :tabindex => "-1" %>
32 
-                </li>
33 
-              <% end %>
32 
+              <li>
33 
+                <%= link_to '<span class="glyphicon glyphicon-pencil"></span> Edit'.html_safe, edit_agent_path(@agent) %>
34 
+              </li>
35 
+
36 
+              <li class="divider"></li>
34 37
35 38 
               <li>
36 
-                <%= link_to '<span class="glyphicon glyphicon-plus"></span> Clone'.html_safe, new_agent_path(id: @agent), :tabindex => "-1" %>
39 
+                <%= link_to '<span class="glyphicon glyphicon-plus"></span> Clone agent'.html_safe, new_agent_path(id: @agent), :tabindex => "-1" %>
37 40 
               </li>
38 41
39 42 
               <li>
 
@@ -44,8 +47,16 @@
44 47 
                 <% end %>
45 48 
               </li>
46 49
50 
+              <li class="divider"></li>
51 
+
52 
+              <% if @agent.can_create_events? && @agent.events.count > 0 %>
53 
+                <li>
54 
+                  <%= link_to '<span class="color-danger glyphicon glyphicon-trash"></span> Delete all events'.html_safe, remove_events_agent_path(@agent), method: :delete, data: {confirm: 'Are you sure you want to delete ALL events for this Agent?'}, :tabindex => "-1" %>
55 
+                </li>
56 
+              <% end %>
57 
+
47 58 
               <li>
48 
-                <%= link_to '<span class="glyphicon glyphicon-remove"></span> Delete'.html_safe, agent_path(@agent), method: :delete, data: { confirm: 'Are you sure?' }, :tabindex => "-1" %>
59 
+                <%= link_to '<span class="color-danger glyphicon glyphicon-remove"></span> Delete agent'.html_safe, agent_path(@agent), method: :delete, data: { confirm: 'Are you sure?' }, :tabindex => "-1" %>
49 60 
               </li>
50 61 
             </ul>
51 62 
           </li>